Merge branch 'upstream'
authorSamuel Mimram <smimram@debian.org>
Mon, 18 Sep 2006 12:45:36 +0000 (12:45 +0000)
committerSamuel Mimram <smimram@debian.org>
Mon, 18 Sep 2006 12:45:36 +0000 (12:45 +0000)
commitef7b1484415f5b66d85cfeebffb58644c3477127
treeb2b58eb03e44eede434bec74878b6fac185f1b66
parenta1724e23d0576bec7ee359738a569cb019ac2694
parente828443432eb8f7bb7d77b044f4e0ca345b71d9e
Merge branch 'upstream'